Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-1.27] Backports for 2023-11 release #8878

Merged
merged 10 commits into from
Nov 16, 2023
Merged

[release-1.27] Backports for 2023-11 release #8878

merged 10 commits into from
Nov 16, 2023
+294 −397

Conversation

brandond
Copy link
Member

@brandond brandond commented Nov 16, 2023 •
edited
Loading

Proposed Changes

Backports for:

Types of Changes

Verification

Testing

See linked issues

Linked Issues

User-Facing Change

new timezone info in Docker image allows the use of `spec.timeZone` in CronJobs
Bumped kine to v0.11.0 to resolve issues with postgres and NATS, fix performance of watch channels under heavy load, and improve compatibility with the reference implementation.
Containerd may now be configured to use rdt or blockio configuration by defining `rdt_config.yaml` or `blockio_config.yaml` files.
Add agent flag disable-apiserver-lb, agent will not start load balance proxy.
Improved ingress IP ordering from ServiceLB
Disable helm CRD installation for disable-helm-controller
Omit snapshot list configmap entries for snapshots without extra metadata
Add jitter to client config retry to avoid hammering servers when they are starting up

Further Comments

iwilltry42 and others added 9 commits November 15, 2023 23:39
@iwilltry42 @brandond
add: timezone info in image
1ffdb09 
Signed-off-by: Thorsten Klein <tk@thklein.io>
(cherry picked from commit a264416)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Bump kine to fix multiple issues
58c4ba0 
Ref: https://github.com/k3s-io/kine/releases/tag/v0.11.0
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 32a1efa)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@LarssonOliver @brandond
QoS-class resource configuration
624d977 
Problem:
Configuring qos-class features in containerd requres a custom containerd configuration template.

Solution:
Look for configuration files in default locations and configure containerd to use them if they exist.

Signed-off-by: Oliver Larsson <larsson.e.oliver@gmail.com>
(cherry picked from commit 30c8ad9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@chenk008 @brandond
add agent flag disable-apiserver-lb (k3s-io#8717)
5b273da 
* add node flag disable-agent-lb
* add agent flag disable-apiserver-lb

Co-authored-by: Brad Davidson <brad@oatmail.org>
Signed-off-by: chenk008 <kongchen28@gmail.com>
(cherry picked from commit b47cbbf)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Fix issue with snapshot metadata configmap
fc9e0ce 
Omit snapshot list configmap entries for snapshots without extra metadata; reduce log level of warnings about missing s3 metadata files.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 2088218)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Skip initial datastore reconcile during cluster-reset
b641d78 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 7ecd587)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@jsnctl @brandond
Tweaked order of ingress IPs in ServiceLB (k3s-io#8711)
95f7cdb 
* Tweaked order of ingress IPs in ServiceLB
    Previously, ingress IPs were only string-sorted when returned
    Sorted by IP family and string-sorted in each family as part of
    filterByIPFamily method
* Update pkg/cloudprovider/servicelb.go
* Formatting

Signed-off-by: Jason Costello <jason@hazy.com>
Co-authored-by: Brad Davidson <brad@oatmail.org>
(cherry picked from commit 07ee854)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@harsimranmaan @brandond
Disable helm CRD installation for disable-helm-controller (k3s-io#8702)
70b0fa6 
* Disable helm CRD installation for disable-helm-controller
    The NewContext package requires config as input which would
    require all third-party callers to update when the new go module
    is published.

    This change only affects the behaviour of installation of helm
    CRDs. Existing helm crds installed in a cluster would not be removed
    when disable-helm-controller flag is set on the server.

    Addresses k3s-io#8701
* address review comments
* remove redundant check

Signed-off-by: Harsimran Singh Maan <maan.harry@gmail.com>
(cherry picked from commit abc2efd)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Add jitter to client config retry
71aec9c 
Also:
* Replaces labeled for/continue RETRY loops with wait helpers for improved readability
* Pulls secrets and nodes from cache for node password verification
* Migrate nodepassword tests to wrangler mocks for better code reuse

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner November 16, 2023 00:13
@brandond
Go generate
de16a29 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@codecov Codecov
Copy link

codecov bot commented Nov 16, 2023 •
edited
Loading

Codecov Report

Attention: 31 lines in your changes are missing coverage. Please review.

Comparison is base (27106c4) 45.95% compared to head (de16a29) 49.85%.

Files Patch % Lines
pkg/etcd/s3.go 0.00% 10 Missing ⚠️
pkg/agent/config/config_linux.go 46.66% 6 Missing and 2 partials ⚠️
pkg/agent/config/config.go 86.66% 3 Missing and 1 partial ⚠️
pkg/etcd/snapshot_controller.go 66.66% 2 Missing ⚠️
pkg/node/controller.go 66.66% 1 Missing and 1 partial ⚠️
pkg/nodepassword/nodepassword.go 75.00% 1 Missing and 1 partial ⚠️
...d/controllers/k3s.cattle.io/v1/etcdsnapshotfile.go 0.00% 1 Missing ⚠️
pkg/server/context.go 93.33% 0 Missing and 1 partial ⚠️
pkg/server/router.go 75.00% 1 Missing ⚠️
Additional details and impacted files 
@@               Coverage Diff                @@
##           release-1.27    #8878      +/-   ##
================================================
+ Coverage         45.95%   49.85%   +3.90%     
================================================
  Files               149      148       -1     
  Lines             15646    15661      +15     
================================================
+ Hits               7190     7808     +618     
+ Misses             7290     6608     -682     
- Partials           1166     1245      +79
Flag Coverage Δ
e2etests 47.21% <63.63%> (?)
inttests 44.50% <61.32%> (+1.08%) ⬆️
unittests 17.78% <27.27%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@brandond brandond merged commit 12e64c8 into k3s-io:release-1.27 Nov 16, 2023
15 checks passed
@brandond brandond deleted the 2023-11-backports_release-1.27 branch June 6, 2024 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vitorsavian vitorsavian vitorsavian approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@brandond @vitorsavian @iwilltry42 @LarssonOliver @chenk008 @jsnctl @harsimranmaan